Define CFLAGS and LDFLAGS for libxenguest.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index d5af8a9dc56e10a9425385643e2ec1e3b25e5240..2ca8898bdd138a378018d362bc78f8f68ef14bd3 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -16,6 +16,9 @@ CFLAGS_include = -I$(XEN_INCLUDE)
 CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
 LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
 
+CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
+LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
+
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
 CFLAGS += -D__XEN_TOOLS__

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 24fa8849f8f676098b4a6edeb84ecfad7f0407c6..cc9e7a606a98300400a4beab28afc29d81c612c4 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -11,10 +11,8 @@
 XEN_ROOT       = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-INCLUDES += $(CFLAGS_libxenctrl) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
-
 CFLAGS += -Werror
-CFLAGS += $(INCLUDES)
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_XENSTORE)
 
 # Make gcc generate dependencies.
 CFLAGS += -Wp,-MD,.$(@F).d
@@ -22,7 +20,7 @@ PROG_DEP = .*.d
 
 PROGRAMS = xc_restore xc_save readnotes
 
-LDLIBS   = $(LDFLAGS_libxenctrl) -L$(XEN_XENSTORE) -lxenguest -lxenstore
+LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) -L$(XEN_XENSTORE) -lxenstore
 
 .PHONY: all
 all: build